Merge git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Fri, 8 Dec 2017 17:02:01 +0000 (12:02 -0500)
committerTom Rini <[email protected]>
Fri, 8 Dec 2017 17:02:01 +0000 (12:02 -0500)

Trivial merge